Fix previous commit: Remove conflict marker. Undo unification of Pavel

Janik's name.

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7b32595083f98acb2c59549ceaebc4777838e774..0b7903a8159d74a27b78d79fae64b6a6d54d82e5 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -19,7 +19,6 @@
        (Basic Char Syntax, General Escape Syntax)
        (Ctl-Char Syntax, Meta-Char Syntax): New subnodes.
 
->>>>>>> 1.751
 2006-09-11  Richard Stallman  <rms@gnu.org>
 
        * display.texi (Display Table Format): Wording clarification.
@@ -4881,7 +4880,7 @@
        (info): Add target.
        (installall): Target removed.
 
-2001-10-31  Pavel Jan\e,Am\e(Bk  <Pavel@Janik.cz>
+2001-10-31  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * tips.texi (Coding Conventions): Fix typo.